From 2c1a8a16e5aa28973e0b41ba6a00a9b414125990 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Wed, 1 Mar 2006 23:35:55 +0100 Subject: [PATCH] Revert two uses of CONFIG_PAGING_LEVELS to CPP rather than C predicate. Fixes PAE and 64-bit builds. Signed-off-by: Keir Fraser --- xen/arch/x86/mm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 05d7704211..60a324cf79 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -506,10 +506,10 @@ get_page_from_l2e( vaddr <<= PGT_va_shift; rc = get_page_and_type_from_pagenr( l2e_get_pfn(l2e), PGT_l1_page_table | vaddr, d); - - if ( (CONFIG_PAGING_LEVELS == 2) && unlikely(!rc) ) +#if CONFIG_PAGING_LEVELS == 2 + if ( unlikely(!rc) ) rc = get_linear_pagetable(l2e, pfn, d); - +#endif return rc; } @@ -538,10 +538,10 @@ get_page_from_l3e( rc = get_page_and_type_from_pagenr( l3e_get_pfn(l3e), PGT_l2_page_table | vaddr, d); - - if ( (CONFIG_PAGING_LEVELS == 3) && unlikely(!rc) ) +#if CONFIG_PAGING_LEVELS == 3 + if ( unlikely(!rc) ) rc = get_linear_pagetable(l3e, pfn, d); - +#endif return rc; } #endif /* 3 level */ -- 2.30.2